Merge from trunk.

author Eli Zaretskii <eliz@gnu.org>

Sat, 20 Oct 2012 11:47:42 +0000 (13:47 +0200)

committer Eli Zaretskii <eliz@gnu.org>

Sat, 20 Oct 2012 11:47:42 +0000 (13:47 +0200)
author Eli Zaretskii <eliz@gnu.org>
Sat, 20 Oct 2012 11:47:42 +0000 (13:47 +0200)
committer Eli Zaretskii <eliz@gnu.org>
Sat, 20 Oct 2012 11:47:42 +0000 (13:47 +0200)
diff --cc lisp/ChangeLog
Simple merge
diff --cc src/ChangeLog
Simple merge
author	Eli Zaretskii <eliz@gnu.org>
	Sat, 20 Oct 2012 11:47:42 +0000 (13:47 +0200)
committer	Eli Zaretskii <eliz@gnu.org>
	Sat, 20 Oct 2012 11:47:42 +0000 (13:47 +0200)
		1	2
lisp/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history